Get rid of this function, instead show the bin_window when it is created.

2005-04-29  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this
	function, instead show the bin_window when it is created.

diff --git a/ChangeLog b/ChangeLog
index 1b026ec63bd7e94b4dad23afc744077579b80565..21856b5bdf7bab65607141e6c506f5a15c46c160 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-04-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this
+       function, instead show the bin_window when it is created.
+
        * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't 
        grab focus to unrealized widgets.  (#302240, Philip Langdale)
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1b026ec63bd7e94b4dad23afc744077579b80565..21856b5bdf7bab65607141e6c506f5a15c46c160 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2005-04-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this
+       function, instead show the bin_window when it is created.
+
        * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't 
        grab focus to unrealized widgets.  (#302240, Philip Langdale)
 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1b026ec63bd7e94b4dad23afc744077579b80565..21856b5bdf7bab65607141e6c506f5a15c46c160 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2005-04-29  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkiconview.c (gtk_icon_view_map): Get rid of this
+       function, instead show the bin_window when it is created.
+
        * gtk/gtkradiobutton.c (gtk_radio_button_focus): Don't 
        grab focus to unrealized widgets.  (#302240, Philip Langdale)
 

diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 6b38de53e0817bf8b0e1b3e1bd6771be83b90e18..b5e89dc55c8b7b215343e84dcfd1326ac19aa0ac 100644 (file)
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -175,7 +175,6 @@ static void gtk_icon_view_destroy (GtkObject *object);
 /* GtkWidget signals */
 static void     gtk_icon_view_realize        (GtkWidget      *widget);
 static void     gtk_icon_view_unrealize      (GtkWidget      *widget);
-static void     gtk_icon_view_map            (GtkWidget      *widget);
 static void     gtk_icon_view_size_request   (GtkWidget      *widget,
                                              GtkRequisition *requisition);
 static void     gtk_icon_view_size_allocate  (GtkWidget      *widget,
@@ -303,7 +302,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
   
   widget_class->realize = gtk_icon_view_realize;
   widget_class->unrealize = gtk_icon_view_unrealize;
-  widget_class->map = gtk_icon_view_map;
   widget_class->size_request = gtk_icon_view_size_request;
   widget_class->size_allocate = gtk_icon_view_size_allocate;
   widget_class->expose_event = gtk_icon_view_expose;
@@ -906,6 +904,8 @@ gtk_icon_view_realize (GtkWidget *widget)
   widget->style = gtk_style_attach (widget->style, widget->window);
   gdk_window_set_background (icon_view->priv->bin_window, &widget->style->base[widget->state]);
   gdk_window_set_background (widget->window, &widget->style->base[widget->state]);
+
+  gdk_window_show (icon_view->priv->bin_window);
 }
 
 static void
@@ -924,19 +924,6 @@ gtk_icon_view_unrealize (GtkWidget *widget)
     (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
 }
 
-static void
-gtk_icon_view_map (GtkWidget *widget)
-{
-  GtkIconView *icon_view;
-
-  icon_view = GTK_ICON_VIEW (widget);
-
-  GTK_WIDGET_SET_FLAGS (widget, GTK_MAPPED);
-
-  gdk_window_show (icon_view->priv->bin_window);
-  gdk_window_show (widget->window);
-}
-
 static void
 gtk_icon_view_size_request (GtkWidget      *widget,
                            GtkRequisition *requisition)